AC_SUBST and AC_DEFINE $shrext into variables for Makefiles and source.

2007-03-13  Michael Schumacher  <schumaml@cvs.gnome.org>

	* configure.ac: AC_SUBST and AC_DEFINE $shrext into variables for
	Makefiles and source.
	* extension/Makefile.am: use $(SHREXT) instead of .$(SOext).
	* babl/babl-extension.c: use SHREXT instead of a hardcoded ".so"
	and get rid of a dirent->d_ino > 0 check which has been there for
	reasons unknown.

svn path=/trunk/; revision=229

diff --git a/ChangeLog b/ChangeLog
index c42f8e55e4aa89f382a2b180e6138fdc7c2c211d..706902fcd996c5ddf1eb560b99e75866056c76f4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-03-13  Michael Schumacher  <schumaml@cvs.gnome.org>
+
+       * configure.ac: AC_SUBST and AC_DEFINE $shrext into variables for
+       Makefiles and source.
+       * extension/Makefile.am: use $(SHREXT) instead of .$SOext.
+       * babl/babl-extension.c: use SHREXT instead of a hardcoded ".so"
+       and get rid of a dirent->d_ino > 0 check which has been there for
+       reasons unknown.
+       
 2007-03-12  Michael Schumacher  <schumaml@cvs.gnome.org>
 
        * Makefile.am: 

diff --git a/babl/babl-extension.c b/babl/babl-extension.c
index 9236abae80758775f83acc842b27d0504f47dffd..3047bee7d8dbfd453a3ed9486bf333394fbb74b0 100644 (file)
--- a/babl/babl-extension.c
+++ b/babl/babl-extension.c
@@ -223,8 +223,7 @@ babl_extension_load_dir (const char *base_path)
 
      while ((dentry = readdir (dir)) != NULL)
        {
-         if (dentry->d_name[0] != '.' &&
-             dentry->d_ino > 0)
+         if (dentry->d_name[0] != '.')
            {
              char   *path = NULL;
              struct  stat st;
@@ -237,7 +236,7 @@ babl_extension_load_dir (const char *base_path)
              stat (path, &st);
 
              if ((extension = strrchr (dentry->d_name, '.')) !=NULL &&
-                 !strcmp (extension, ".so"))
+                 !strcmp (extension, SHREXT))
                {
                   babl_extension_load (path);
                }

diff --git a/configure.ac b/configure.ac
index bb54b15182bfd0c1a8150ad8e313c9df06e403f9..bc973738c076be3fb9fbf09ddf0cdb54e3cfc719 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -202,6 +202,14 @@ AC_DEFINE_UNQUOTED(BABL_PATH, "~/.babl-$BABL_API_VERSION:/usr/local/lib/babl-$BA
 AC_DEFINE(BABL_PATH_SEPERATOR, "/", [string used to seperate directories in a path string]) 
 AC_DEFINE(BABL_LIST_SEPERATOR, ':', [seperator between paths in BABL_PATH])
 
+#####################################
+# File extension for shared libraries
+#####################################
+
+SHREXT=$shrext
+AC_SUBST(SHREXT)
+AC_DEFINE_UNQUOTED(SHREXT, "$shrext", [File extension for shared libraries])
+
 dnl ===========================================================================
 
 

diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index 491d667cd86f3dca97b31189f529afd4d2f1cc8f..f8d3a5d75a2a6d16e9bd7340dcbd9e91f7c72480 100644 (file)
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -3,15 +3,12 @@
 
 if OS_WIN32
 no_undefined = -no-undefined
-SOsuf=dll
 libbabldlla=$(top_builddir)/babl/.libs/libbabl-$(BABL_API_VERSION).dll.a
-else
-SOsuf=so
 endif
 
 CFILES          = $(wildcard $(srcdir)/*.c)
-SOBJS           = $(subst $(srcdir)/,,$(CFILES:.c=.$(SOsuf)))
-INSTALLED_ITEMS = $(subst $(srcdir),$(ext_dir),$(CFILES:.c=.$(SOsuf)))
+SOBJS           = $(subst $(srcdir)/,,$(CFILES:.c=$(SHREXT)))
+INSTALLED_ITEMS = $(subst $(srcdir),$(ext_dir),$(CFILES:.c=$(SHREXT)))
 EXTRA_DIST      = $(wildcard *.[ch])
 
 all-local: $(SOBJS)
@@ -22,17 +19,17 @@ LDFLAGS += -shared
 
 LDADD    = $(no-undefined) $(libbabldlla)
 
-%.$(SOsuf): %.c
+%$(SHREXT): %.c
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD)
 
 # if extension needing external libraries are to be # compiled with this make
 # file, each of them can be added according to the this pattern:
-# extra.$(SOsuf): extra.c
+# extra$(SHREXT): extra.c
 #      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<  [own compile and link flags]
 
-CIE-Lab.$(SOsuf): CIE-Lab.c
+CIE-Lab$(SHREXT): CIE-Lab.c
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(MATH_LIB)
-#lcms.$(SOsuf): lcms.c
+#lcms$(SHREXT): lcms.c
 #      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) `pkg-config lcms --cflags --libs`
 #############################################################################